67. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Dec 13 16:40:55 2019 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

67.1 Files compared

#	Location	File	Last Modified
1			Fri Dec 13 16:40:55 2019 UTC
2	Porto v.3.2.2\Theme Files\Magento 1.x\Porto Theme\app\design\frontend\smartwave\porto\template\page\html	header_type24.phtml	Thu Nov 21 11:58:50 2019 UTC

67.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	0	0
Changed	0	0
Inserted	1	60
Removed	0	0

67.3 Comparison options

Whitespace	All differences in whitespace within lines are ignored
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

67.4 Active regular expressions

No regular expressions were active.

67.5 Comparison detail

				1		<?php
				2		$store = Mage::a pp()->getS tore();
				3		$code = $store- >getCode() ;
				4		$custo m_block = Mage::getS toreConfig ('porto_se ttings/hea der/static _block', $ code);
				5		?>
				6		<div class ="header-c ontainer t ype24 head er-newskin ">
				7		<div c lass="top- links-cont ainer">
				8		<d iv class=" top-links container" >
				9		<div cla ss="top-li nks-inner" >
				10		<?ph p
				11		$sto re_currenc y = $this- >getChildH tml('store _currency' );
				12		$sto re_languag e = $this- >getChildH tml('store _language' );
				13		?>
				14		<?ph p echo $st ore_curren cy; ?>
				15		<?ph p if($stor e_currency && $store _language) :?>
				16		<span clas s="split"> </span>
				17		<?ph p endif; ? >
				18		<?ph p echo $st ore_langua ge; ?>
				19		<?ph p if($stor e_currency \|\| $store _language) :?>
				20		<span clas s="split"> </span>
				21		<?ph p endif; ? >
				22		<?ph p
				23		$compare_l ink = $thi s->getChil dHtml('com pare_link' );
				24		?>
				25		<?ph p echo $co mpare_link ; ?>
				26		<div class="to p-links-ar ea">
				27		<div class ="top-link s-icon"><a href="jav ascript:vo id(0)"><?p hp echo $t his->__("l inks"); ?> </a></div>
				28		<?php echo $this->ge tChildHtml ('topLinks '); ?>
				29		</di v>
				30		<p c lass="welc ome-msg">< ?php echo $this->get ChildHtml( 'welcome') ; ?> <?php echo $thi s->getAddi tionalHtml (); ?></p>
				31		<div class="cl earer"></d iv>
				32		</div>
				33		</ div>
				34		</div>
				35		<div c lass="head er contain er">
				36		<d iv class=" menu-icon" ><a href=" javascript :void(0)" title="<?p hp echo $t his->__('M enu'); ?>" ><i class= "fa fa-bar s"></i></a ></div>
				37		<? php if ($t his->getIs HomePage() ):?>
				38		<h 1 class="l ogo"><stro ng><?php e cho $this- >getLogoAl t(); ?></s trong><a h ref="<?php echo $thi s->getUrl( ''); ?>" t itle="<?ph p echo $th is->getLog oAlt(); ?> " class="l ogo"><img src="<?php echo $thi s->getLogo Src(); ?>" alt="<?ph p echo $th is->getLog oAlt(); ?> " /></a></ h1>
				39		<? php else:? >
				40		<a href="<?p hp echo $t his->getUr l(''); ?>" title="<? php echo $ this->getL ogoAlt(); ?>" class= "logo"><st rong><?php echo $thi s->getLogo Alt(); ?>< /strong><i mg src="<? php echo $ this->getL ogoSrc(); ?>" alt="< ?php echo $this->get LogoAlt(); ?>" /></a >
				41		<? php endif; ?>
				42
				43		<d iv class=" header-mai n-right">
				44		<div cla ss="search -area">
				45		<a h ref="javas cript:void (0);" clas s="search- icon"><i c lass="icon -magnifier "></i><spa n><?php ec ho $this-> __('Search '); ?></a>
				46		<?ph p echo $th is->getChi ldHtml('to pSearch'); ?>
				47		</div>
				48		<?php ec ho '<div c lass="cust om-block"> '.$this->g etLayout() ->createBl ock('cms/b lock')->se tBlockId($ custom_blo ck)->toHtm l().'</div >'; ?>
				49		<div cla ss="accoun t-link">
				50		<a h ref="<?php echo $thi s->getUrl( 'customer/ account'); ?>" title ="My Accou nt"><i cla ss="porto- new-icon-u ser-2"></i ></a>
				51		</div>
				52		<div cla ss="wishli st-link">
				53		<a h ref="<?php echo $thi s->getUrl( 'wishlist' ); ?>" tit le="<?php echo $this ->__('Wish list'); ?> "><i class ="porto-ne w-icon-wis hlist-2">< /i></a>
				54		</div>
				55		<?php ec ho $this-> getChildHt ml('minica rt'); ?>
				56		</ div>
				57		</div>
				58		<?php echo $this ->getChild Html('topM enu') ?>
				59		</div>
				60		<?php echo $this->ge tChildHtml ('mobile.n av') ?>